Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 9 Sep 2010 06:13:05 +0000 (06:13 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 9 Sep 2010 06:13:05 +0000 (06:13 +0000)

Trivial merge